Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 8 Jul 2011 20:14:28 +0000 (13:14 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 8 Jul 2011 20:14:28 +0000 (13:14 -0700)

Trivial merge